[IA64] Compilation fix of p2m module

nsec_t is replaced with s64 and update Makefile of expose_p2m.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/arch/ia64/tools/p2m_expose/Makefile b/xen/arch/ia64/tools/p2m_expose/Makefile
index d346326d0539e4724663a01ea479a612b59be2a0..8b450d9900828acdfa07b39b26926f600ad71ea0 100644 (file)
--- a/xen/arch/ia64/tools/p2m_expose/Makefile
+++ b/xen/arch/ia64/tools/p2m_expose/Makefile
@@ -3,12 +3,15 @@ obj-m += expose_p2m.o
 else
 PWD := $(shell pwd)
 TOPDIR ?= $(abspath $(PWD)/../../../../..)
-KDIR ?= $(TOPDIR)/linux-$(shell awk '/^LINUX_VER\>/{print $$3}' $(TOPDIR)/buildconfigs/mk.linux-2.6-xen)-xen
+KVER ?= $(shell awk '/^LINUX_VER\>/{print $$3}' $(TOPDIR)/buildconfigs/mk.linux-2.6-xen)
+KDIR ?= $(TOPDIR)/linux-$(KVER)-xen
 #CROSS_COMPILE ?= ia64-unknown-linux-
 #ARCH ?= ia64
 
 ifneq ($(O),)
 OPT_O := O=$(realpath $(O))
+else
+OPT_O ?= O=$(TOPDIR)/build-linux-$(KVER)-xen_ia64
 endif
 
 ifneq ($(V),)

diff --git a/xen/arch/ia64/tools/p2m_expose/expose_p2m.c b/xen/arch/ia64/tools/p2m_expose/expose_p2m.c
index 26e0b5188e23b14f342c5e252a2e58833041a697..9ab2a5578dfeab1a9e13a808d246ccd8078f69a8 100644 (file)
--- a/xen/arch/ia64/tools/p2m_expose/expose_p2m.c
+++ b/xen/arch/ia64/tools/p2m_expose/expose_p2m.c
@@ -64,7 +64,7 @@ do_p2m(unsigned long (*conv)(unsigned long),
        unsigned long gpfn;
        unsigned long mfn;
        unsigned long count;
-       nsec_t nsec;
+       s64 nsec;
 
        count = 0;
        do_gettimeofday(&before_tv);